borderimage: Use style context as argument

... not the theming engine.

diff --git a/gtk/gtkborderimage.c b/gtk/gtkborderimage.c
index 694db6fe0a86c079643af176c142f6321b52a1aa..b6e7346ce236bee8dac5fb4b8116e8414b5bde57 100644 (file)
--- a/gtk/gtkborderimage.c
+++ b/gtk/gtkborderimage.c
@@ -39,15 +39,15 @@
 
 gboolean
 _gtk_border_image_init (GtkBorderImage   *image,
-                        GtkThemingEngine *engine)
+                        GtkStyleContext  *context)
 {
-  image->source = _gtk_css_image_value_get_image (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_IMAGE_SOURCE));
+  image->source = _gtk_css_image_value_get_image (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_IMAGE_SOURCE));
   if (image->source == NULL)
     return FALSE;
 
-  image->slice = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_IMAGE_SLICE);
-  image->width = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_IMAGE_WIDTH);
-  image->repeat = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_IMAGE_REPEAT);
+  image->slice = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_IMAGE_SLICE);
+  image->width = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_IMAGE_WIDTH);
+  image->repeat = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_IMAGE_REPEAT);
 
   return TRUE;
 }

diff --git a/gtk/gtkborderimageprivate.h b/gtk/gtkborderimageprivate.h
index 682e6e837d8cb5bf2c8defcb36bffdfde19675fc..c82fe82cc9aacfaf1f7d0b9f1efc7195e49cd5b8 100644 (file)
--- a/gtk/gtkborderimageprivate.h
+++ b/gtk/gtkborderimageprivate.h
@@ -25,7 +25,6 @@
 #include "gtkborder.h"
 #include "gtkcssimageprivate.h"
 #include "gtkcssvalueprivate.h"
-#include "gtkthemingengine.h"
 
 G_BEGIN_DECLS
 
@@ -40,7 +39,7 @@ struct _GtkBorderImage {
 };
 
 gboolean          _gtk_border_image_init             (GtkBorderImage       *image,
-                                                      GtkThemingEngine     *engine);
+                                                      GtkStyleContext      *context);
 
 void              _gtk_border_image_render           (GtkBorderImage       *image,
                                                       const double          border_width[4],

diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
index bdb10d241b6df5d91e3565e58b15b4e06a074d80..337a61c43bd3b78f3ec3929ab248f5a29bcc69ca 100644 (file)
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -1766,7 +1766,7 @@ render_frame_internal (GtkThemingEngine *engine,
 
   gtk_theming_engine_hide_border_sides (border_width, border_style, hidden_side);
 
-  if (_gtk_border_image_init (&border_image, engine))
+  if (_gtk_border_image_init (&border_image, engine->priv->context))
     _gtk_border_image_render (&border_image, border_width, cr, x, y, width, height);
   else
     {